From b6036a88a61ac22bdf4ac0877134d20413aacc78 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Jan 2009 18:14:58 +0000 Subject: [PATCH] Use a better caps lock warning icon svn path=/trunk/; revision=22070 --- ChangeLog | 7 +++++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/Makefile.am | 1 + docs/reference/gtk/tmpl/gtkstock.sgml | 9 +++++++++ gtk/gtkentry.c | 2 +- gtk/gtkiconfactory.c | 1 + gtk/gtkstock.h | 1 + gtk/stock-icons/16/gtk-caps-lock-warning.png | Bin 0 -> 275 bytes gtk/stock-icons/24/gtk-caps-lock-warning.png | Bin 0 -> 360 bytes 9 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gtk/stock-icons/16/gtk-caps-lock-warning.png create mode 100644 gtk/stock-icons/24/gtk-caps-lock-warning.png diff --git a/ChangeLog b/ChangeLog index 75ffeed52e..de1427e55d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-04 Matthias Clasen + + * gtk/stock-icons/{16,24}/gtk-caps-lock-warning.png: New icons + * gtk/gtkstock.h: Add GTK_STOCK_CAPS_LOCK_WARNING. + * gtk/gtkiconfactory.c (get_default_icons): Register the stock icon. + * gtk/gtkentry.c (show_capslock_feedback): Use the new stock icon. + 2009-01-05 Tor Lillqvist Bug 566628 - gdk_display_close always asserts on win32 diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index d6c5b6bdde..0a4b01ddb7 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2009-01-05 Matthias Clasen + + * gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_CAPS_LOCK_WARNING + * gtk/Makefile.am: And copy the icon + 2009-01-04 Matthias Clasen Bug 566045 – GtkViewport is lacking a description diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index cf819d58a3..7f5b9b3c13 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -181,6 +181,7 @@ HTML_IMAGES = \ $(top_srcdir)/gtk/stock-icons/20/gtk-apply.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-bold.png \ $(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png \ + $(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-clear.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-close.png \ diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 65e6a509b9..6da3b7b0f8 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -151,6 +151,15 @@ The "Cancel" item. + + +The "Caps Lock Warning" icon. + + + +@Since: 2.16 + + The "CD-Rom" item. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 20a21c8a3f..5db98af14a 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -9339,7 +9339,7 @@ show_capslock_feedback (GtkEntry *entry, if (gtk_entry_get_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY) { - gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_INFO); + gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CAPS_LOCK_WARNING); gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE); priv->caps_lock_warning_shown = TRUE; } diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index ba90ddd09e..cced1108e5 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -509,6 +509,7 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_CONNECT); register_stock_icon (factory, GTK_STOCK_DISCONNECT); register_stock_icon (factory, GTK_STOCK_EDIT); + register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING); register_bidi_stock_icon (factory, GTK_STOCK_MEDIA_FORWARD, GTK_STOCK_MEDIA_FORWARD "-ltr", diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 8fef6d479a..2cbe0b61ea 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -84,6 +84,7 @@ void gtk_stock_set_translate_func (const gchar *domain, #define GTK_STOCK_APPLY "gtk-apply" #define GTK_STOCK_BOLD "gtk-bold" #define GTK_STOCK_CANCEL "gtk-cancel" +#define GTK_STOCK_CAPS_LOCK_WARNING "gtk-caps-lock-warning" #define GTK_STOCK_CDROM "gtk-cdrom" #define GTK_STOCK_CLEAR "gtk-clear" #define GTK_STOCK_CLOSE "gtk-close" diff --git a/gtk/stock-icons/16/gtk-caps-lock-warning.png b/gtk/stock-icons/16/gtk-caps-lock-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..0dfa4187619b6cf4b69410bb84e8553e85daa866 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XwtBiahE&{2`t$$4J+o><>ajDKJD#vK{IHv{mg9*02F;{H z$rbij1O(O{U&=9^kh4YGB^vdpJ-oo)F8ob*QxpY>x^pt{h7%)-#l_b34_jq2?ziDEH2#1 zwCo>)@IDQvZq_vyxr`Pt-t<>t2sosbFvl+WRW*}hKYtCw&IgRFGe0saFTE+LaDZW9 Xt!CX3bqOY*2N*nE{an^LB{Ts5zs6)* literal 0 HcmV?d00001 diff --git a/gtk/stock-icons/24/gtk-caps-lock-warning.png b/gtk/stock-icons/24/gtk-caps-lock-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..ca76d509bab52e9e58d243f28a3bc01527ef3167 GIT binary patch literal 360 zcmV-u0hj)XP)A4oC$eiVp;^MJ$;BB@S7LjaVER4OfI0z{)BnByUj@)Wd?Cg_!b$ z2v_3@sz4@EDi0Dt04#_m0PzPZ8xAtB5yW5|@~sMh00RK3OhUKr0VX5>0000